Make the umbrella context nest (#58261) - #58261
Open
j-piasecki wants to merge 1 commit into
Open
Conversation
meta-cla
Bot
added
the
CLA Signed
|
@j-piasecki has exported this pull request. If you are a Meta employee, you can view the originating Diff in D118114589. |
facebook-github-tools
Bot
added
p: Software Mansion
cortinico
approved these changes
Sep 1, 2026
cortinico
left a comment
cortinico
left a comment
Contributor
There was a problem hiding this comment.
Review automatically exported from Phabricator review in Meta.
Summary: Umbrellas bracketed their includes with a bare `#define`/`#undef` of `RN_UMBRELLA_CONTEXT`. That does not nest: an umbrella reached from inside another umbrella's context cleared it on the way out, so every public header the outer umbrella included afterwards hit `UmbrellaGuard.h`. Switch the bracket to `#pragma push_macro`/`pop_macro` so the inner umbrella restores the outer context instead of clearing it. Nothing nests today, it starts once a for-frameworks header reaches a public module through its umbrella. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D118114589
meta-codesync
Bot
changed the title
j-piasecki
force-pushed
the
export-D118114589
branch
from
September 2, 2026 08:48
c84b87d to
6fb26c6
Compare
j-piasecki
added a commit
to j-piasecki/react-native
that referenced
this pull request
Sep 2, 2026
Summary: Umbrellas bracketed their includes with a bare `#define`/`#undef` of `RN_UMBRELLA_CONTEXT`. That does not nest: an umbrella reached from inside another umbrella's context cleared it on the way out, so every public header the outer umbrella included afterwards hit `UmbrellaGuard.h`. Switch the bracket to `#pragma push_macro`/`pop_macro` so the inner umbrella restores the outer context instead of clearing it. Nothing nests today, it starts once a for-frameworks header reaches a public module through its umbrella. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D118114589
j-piasecki
force-pushed
the
export-D118114589
branch
from
September 2, 2026 08:48
6fb26c6 to
2f1baa4
Compare
j-piasecki
added a commit
to j-piasecki/react-native
that referenced
this pull request
Sep 2, 2026
Summary: Umbrellas bracketed their includes with a bare `#define`/`#undef` of `RN_UMBRELLA_CONTEXT`. That does not nest: an umbrella reached from inside another umbrella's context cleared it on the way out, so every public header the outer umbrella included afterwards hit `UmbrellaGuard.h`. Switch the bracket to `#pragma push_macro`/`pop_macro` so the inner umbrella restores the outer context instead of clearing it. Nothing nests today, it starts once a for-frameworks header reaches a public module through its umbrella. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D118114589
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
Umbrellas bracketed their includes with a bare
#define/#undefofRN_UMBRELLA_CONTEXT. That does not nest: an umbrella reached from insideanother umbrella's context cleared it on the way out, so every public header
the outer umbrella included afterwards hit
UmbrellaGuard.h. Switch thebracket to
#pragma push_macro/pop_macroso the inner umbrella restores theouter context instead of clearing it.
Nothing nests today, it starts once a
for-frameworks header reaches a public module through its umbrella.
Changelog: [Internal]
Reviewed By: cortinico
Differential Revision: D118114589